pygrub: Correct pygrub return value
authorKeir Fraser <keir.fraser@citrix.com>
Tue, 15 Sep 2009 08:21:34 +0000 (09:21 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Tue, 15 Sep 2009 08:21:34 +0000 (09:21 +0100)
This is the patch to correct pygrub return value for checkPassword()
function. It didn't return False at the end of the function. It
returned None so it was working fine and it's most likely just a
cosmetic issue.

Also, the missing () were added to checkPassword() function when
calling hasPassword and the unnecessary comment was removed.

Signed-off-by: Michal Novotny <minovotn@redhat.com>
tools/pygrub/src/GrubConf.py

index 4aac8c189b77bd294f88b49ffe8f18eb02e358e0..cfd75dbc481d1b2055dd0ee63778af4ce75ff760 100644 (file)
@@ -220,10 +220,9 @@ class GrubConfigFile(object):
 
     def checkPassword(self, password):
         # Always allow if no password defined in grub.conf
-        if not self.hasPassword:
+        if not self.hasPassword():
             return True
 
-        # If we're here, we're having 'password' attribute set
         pwd = getattr(self, 'password').split()
 
         # We check whether password is in MD5 hash for comparison
@@ -240,6 +239,8 @@ class GrubConfigFile(object):
         if pwd[0] == password:
             return True
 
+        return False
+
     def set(self, line):
         (com, arg) = grub_exact_split(line, 2)
         if self.commands.has_key(com):